Follow-up Comment #5, task #1506 (project savane):
" BTW: Should I commit the exact same fix in HEAD and the branch twice? I
thought that this could create some confusion, so I refrained from doing
so."
In fact, you should not commit on the HEAD a fix that have to go on the
branch. The proper way to get such fix on the HEAD is to merge the file with
the branch. Otherwise, you only have two option, the one you picked (the most
sensible; commiting only on the HEAD) which breaks the branch or commiting on
both HEAD and branch which will ends up in merge conflicts later.
_______________________________________________________
Reply to this item at:
<http://gna.org/task/?func=detailitem&item_id=1506>
_______________________________________________
Message posté via/par Gna!
http://gna.org/