DCBIA-OrthoLab / Q3DCExtension

Apache License 2.0
4 stars 14 forks source link

add 6 columns in excel for meanings #84

Closed HUTIN1 closed 2 years ago

allemangD commented 2 years ago

The changes in add-AQ3DC-module were already squashed together and merged into master, so this PR includes many duplicate changes. It looks like the only new commit is 94ccba6. Notice how GitHub says there are 30 commits in this PR; there should only be the one.

I suggest, if you have not already, to add a remote for this upstream repository so you can easily update.

git remote add upstream 'https://github.com/DCBIA-OrthoLab/Q3DCExtension'

Here are the commands I would use to resolve the issue, assuming the remote for your fork is called origin and for DCBIA-OrthoLab is called upstream:

# make sure everything is up-to-date
git fetch --all
git checkout add-AQ3DC-module

# replay the last 1 commit of add-AQ3DC-module on top of master
git rebase --onto upstream/master add-AQ3DC-module~1

# check there is only the one new commit
# this should only print one commit with message "Update AQ3DC.py"
git rev-list --pretty=oneline master..add-AQ3DC-module

I would also modify the commit message to include some detail about what change was made, since "Update AQ3DC.py" is very vague. See Slicer commit message guidelines here: https://slicer.readthedocs.io/en/latest/developer_guide/contributing.html#how-to-write-commit-messages

git commit --amend -m "ENH: Include sign meaning in Excel export"

Once you verify the history is correct, you'll need to force-push since you removed/modified already-pushed commits.

git push -u origin add-AQ3DC-module --force-with-lease

There is some good explanation on git rebase here: https://www.atlassian.com/git/tutorials/merging-vs-rebasing and https://stackoverflow.com/a/69109275/4672189

You will know that things are resolved when GitHub adds a message to this PR like "HUTIN1 force-pushed 1 commit" and the PR indicates only the one relevant change.