lhoupert / m_moorproc_toolbox

2 stars 3 forks source link

Keep dy120 branch as a identical copy of the mooring processing directory at the end of the dy120 cruise #5

Closed lhoupert closed 3 years ago

lhoupert commented 3 years ago

Initially, we merged changes that @LewisDrysdale made after the cruise into the dy120 branch (https://github.com/lhoupert/m_moorproc_toolbox/commit/dc9a074ddd653ed6d0f1ce0149b5eb28b2a1568b).

However, in order to keep an identical copy of the dy120 code, we create a new branch postdy120 where changes in the processing code will be recorded.

To revert the dy120 branch prior to its original state, I followed this process:

1) git lg (to display the log). I got his:

* 4221c6c - (HEAD -> dy120, origin/dy120) Update README.md (29 minutes ago) <Loïc Houpert>
*   dc9a074 - Merge pull request #3 from LewisDrysdale/dy120 (2 days ago) <Loïc Houpert>
|\  
| * 417c0bd - update microcat_caib_cruise.csv (2 days ago) <LewisDrysdale>
| * 8c971ed - Added a depployment depth .dat file for dy120 (05) (2 days ago) <LewisDrysdale>
|/  
* 80e31f1 - add microcat calib coefficients files (2 weeks ago) <Loic Houpert>
* ca9fe77 - dy120 exec version (2 weeks ago) <Loic Houpert>
* fe06d0c - (origin/legacy, legacy) . (3 months ago) <Loic Houpert>
* fe78592 - . (3 months ago) <Loic Houpert>
* 4ee7cef - move from bitbucket repo (3 months ago) <Loic Houpert>

2) Identify that the commit responsible for the merge (dc9a074)

3) Then revert the change due to this merge using the command: git revert -m 1 dc9a074

4) And push the changes to the remote repository with: git push origin dy120

5) The history didn’t change but now the log display another commit :

* bf2a80b - (HEAD -> dy120, origin/dy120) Revert "Merge pull request #3 from LewisDrysdale/dy120" (6 minutes ago) <Loic Houpert>
* 4221c6c - Update README.md (65 minutes ago) <Loïc Houpert>
*   dc9a074 - Merge pull request #3 from LewisDrysdale/dy120 (2 days ago) <Loïc Houpert>
|\  
| * 417c0bd - update microcat_caib_cruise.csv (2 days ago) <LewisDrysdale>
| * 8c971ed - Added a depployment depth .dat file for dy120 (05) (2 days ago) <LewisDrysdale>
|/  
* 80e31f1 - add microcat calib coefficients files (2 weeks ago) <Loic Houpert>
* ca9fe77 - dy120 exec version (2 weeks ago) <Loic Houpert>
* fe06d0c - (origin/legacy, legacy) . (3 months ago) <Loic Houpert>
* fe78592 - . (3 months ago) <Loic Houpert>
* 4ee7cef - move from bitbucket repo (3 months ago) <Loic Houpert>