On Tuesday, December 17, 2013 4:33:41 PM UTC, Jeroen Demeyer wrote: > > On 2013-12-17 17:32, Volker Braun wrote: > > Its trivial to check that there is no conflict in case you are worried. > OK, how? >
For example, by merging and then throwing away the merge. Another way of "throwing away" the merge (besides the "git reset --hard HEAD~") is to do it in an anonymous branch, that is, on a "detached head": git checkout --detach my_branch git merge master ... do whatever you want on the detached head ... git checkout my_branch # leave detached head mode -- You received this message because you are subscribed to the Google Groups "sage-git" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
