search

project8 / Pypeline

A python interface for the dripline slow control system.
Other
2 stars 0 forks source link

merge conflicts with git #22

Closed laroque closed 12 years ago

laroque commented 12 years ago

Pypeline should be able to deal with rejected push in the torrent database in some reasonable way... Not sure what the right way to do that actually is.

1) try a git pull then a new git push 2) message to user? other options?

Should have a --force option or some such that will check and/or redo each stage of the file generation and/or transfer process, making sure everything ended up on Myrna correctly...

Really what I need is a good way to deal with the case of generatetorrents.py encountering a problem and wanting to retry.

laroque commented 12 years ago

The push is now for just the branch of interest. Should avoid issues related to changes on other branches. If there is a merge conflict on master it should probably be dealt with by a person so I'm probably not going to change the way that works.