pick 3f5a7a3cc Check interruption in include/dijkstra
squash c1e8d07cd Check interruption in include/dijkstra
squash f67c53d5a Check interruption in include/allpairs
...
Leave the instructions just as they are as comments
when the second file opens then you can make a larger commit message
save & close (or close saving the file)
then it applyies the commits and at the end it will open another file that looks like:
# This is a combination of 26 commits.
# This is the 1st commit message:
Check interruption in include/dijkstra
# This is the commit message #2:
Check interruption in include/dijkstra
# This is the commit message #3:
Check interruption in include/allpairs
...
Cannot 'squash' without a previous commit
you need to change the comands from pick to squash as in this examplepick 3f5a7a3cc Check interruption in include/dijkstra squash c1e8d07cd Check interruption in include/dijkstra squash f67c53d5a Check interruption in include/allpairs ...
To update, should I use this command: git rebase --continue.
or delete the rebase-merge and run the command again
The second file works a bit different
you need to remove what is unnecessary as commit message
Second file looks like
# This is a combination of 26 commits. # This is the 1st commit message: Check interruption in include/dijkstra # This is the commit message #2: Check interruption in include/dijkstra # This is the commit message #3: Check interruption in include/allpairs ...
delete the unnecessary lines and add lines like
Honoring cancellation request (closes #232)
* allpairs
* dijkstra
* (list of directories you can get from the end of the file)This must be at the end of the file (with comments)
modified: NEWS
modified: doc/src/pgRouting-introduction.rst
modified: doc/src/release_notes.rst
modified: include/allpairs/pgr_allpairs.hpp
modified: include/astar/pgr_astar.hpp
modified: include/bellman_ford/pgr_bellman_ford.hpp
modified: include/bellman_ford/pgr_edwardMoore.hpp
modified: include/breadthFirstSearch/pgr_breadthFirstSearch.hpp
modified: include/contraction/pgr_deadEndContraction.hpp
new file: include/cpp_common/interruption.h
modified: include/dagShortestPath/pgr_dagShortestPath.hpp
modified: include/dijkstra/pgr_dijkstra.hpp
modified: include/max_flow/pgr_maxflow.hpp
modified: include/spanningTree/pgr_kruskal.hpp
modified: include/spanningTree/pgr_mst.hpp
modified: include/spanningTree/pgr_prim.hpp
modified: include/spanningTree/pgr_randomSpanningTree.hpp
modified: include/topologicalSort/pgr_topologicalSort.hpp
modified: src/alpha_shape/pgr_alphaShape.cpp
modified: src/components/pgr_components.cpp
modified: src/trsp/trsp.cSo the directories that you modified are
So we are working in a different branch we can practice and not mess up with the original that is in master
I have to go now, family feeding time
On the meantime, just try to do the rebase.
We are working on a different branch just in case we mess up we have the original on master, so make sure that you are not on master (git status) before trying again.
Hello students
This meeting is part of the Bolsena online code sprint, so we will work on combination:
this chat and https://meet.jit.si/pgrouting
this chat and https://meet.jit.si/pgrouting
This week its also the evaluation period of GSoC, so dont forget to evaluate,