Skip to content
Prev 12981 / 21307 Next

[Bioc-devel] Applying changes to existing package

On 03/19/2018 03:20 AM, Christian Oertlin wrote:
Usually this means that the package is fundamentally broken. In this 
case the DESCRIPTION file in git is not formatted correctly

$ cat DESCRIPTION
Package: anota2seq
<<<<<<< HEAD
Version: 1.0.1
=======
Version: 1.1.0
 >>>>>>> upstream/master


This the result of a 'merge conflict' and you need to resolve it (edit 
DESCRIPTION file) so that it is correct. Remember that you are 
contributing to the 'devel' branch, where the current version of your 
package is 1.1.0. So the next version should be 1.1.1.

Remember also that you can build and check your package locally before 
pushing it, so that these errors are easily spotted.

Martin
This email message may contain legally privileged and/or...{{dropped:2}}