Jump to content

Avoid merging conflit


cyberium

Recommended Posts

Purpose :

Avoid conflit when pulling from another repository. (or between 2 patch)

Case :

AHBOT and PLAYERBOT need to modify same file in the same place.

What file :

original Makefile.am

## Sub-directories to parse

The problem :

ahbot Makefile.am

## Sub-directories to parse
SUBDIRS = AuctionHouseBot

playerbot Makefile.am

## Sub-directories to parse
SUBDIRS = playerbot

goal :

## Sub-directories to parse
SUBDIRS = AuctionHouseBot playerbot

or

## Sub-directories to parse
SUBDIRS = AuctionHouseBot
SUBDIRS+ = playerbot 

Didn't found any clean way to avoid merge conflit in all case. (ahbot first or playerbot first)

Any proposal are welcome.

Link to comment
Share on other sites

×
×
  • Create New...

Important Information

We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue. Privacy Policy Terms of Use