Hi,
The white space (formatting) is a mistake on our end.
But as far as the instructions go it is mostly accurate.
Once GIT reports after the “merge” that you have conflicts, you could also, try
this command,
`git mergetool`
which will open a GUI to help you choose which version you want i.e HEAD vs
upstream/master.
https://git-scm.com/docs/git-mergetool
Best,
Nitesh
> On Oct 12, 2017, at 2:03 PM, Vladislav Petyuk <[email protected]> wrote:
>
> While resolving conflicts according to this protocol
> https://master.bioconductor.org/developers/how-to/git/resolve-conflicts/
> I ran into a quite a number of seeming duplications of the file content
> between HEAD and upstream/master. It looks like either some sort of
> whitespace or end of line formatting issue.
> E.g.
> <<<<<<< HEAD
> BiocGenerics:::testPackage("MSnID")
> =======
> BiocGenerics:::testPackage("MSnID")
>>>>>>>> upstream/master
> What is the recommended way to avoid all this trouble?
> Thanks,
> Vlad
>
> [[alternative HTML version deleted]]
>
> _______________________________________________
> [email protected] mailing list
> https://stat.ethz.ch/mailman/listinfo/bioc-devel
This email message may contain legally privileged and/or confidential
information. If you are not the intended recipient(s), or the employee or
agent responsible for the delivery of this message to the intended
recipient(s), you are hereby notified that any disclosure, copying,
distribution, or use of this email message is prohibited. If you have received
this message in error, please notify the sender immediately by e-mail and
delete this email message from your computer. Thank you.
_______________________________________________
[email protected] mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel
