Tdma
Merge request reports
Activity
added 2 commits
Hi @bbb, I need your help. Just now I did the second rebase in order to clean the commit "Add Lina's Msc...". As a result, this commit is squashed into its previous commit "Add preliminary version of arrival curves".
The problem: the commit "Add preliminary version of arrival curves" is one commit of Felipe, whether it will cause some problems?
For a better understanding, history of branch TDMA as follows:
- create the branch TDMA on top of the branch "fradet:arrival curves" but not "fradet:master" (it's my fault. I should have created the branch TDMA on top of master)
- find my fault in the first step and removed the files concerning about "arrival curves"
- finish TDMA proofs
That's why there is a commit "Add Lina's Msc..." which belongs to "arrival curves".
So now how should I do to deal with this issue? Could you help me?
Thank you in advance,
Xiaojie
Hi Xiaojie,
first of all, I presume you have a backup of all your work in form of local or archival branches (if not: create them now).
Second, yes, squashing something into Felipe's commit is not a good idea. It's very likely to cause major merge headaches down the road, and also causes attribution problems.
What to do? It should actually be easy because you can rebase on top of any branch / commit.
- Create a new branch for trying this out (say,
my-test) that is identical to the TDMA branch:git checkout -b my-test TDMA.
This branch is still based on the arrival curves branch. This is ok.
-
Do an interactive rebase of the my-test branch on top of the master branch:
git rebase -i master. -
Just drop (not squash) any commits that you do not want to keep in this branch.
That should be it: now you have a clean branch on top of
master.Makes sense?
- Create a new branch for trying this out (say,
Thanks for your nice lessons about git ;-) @bbb
added 2 commits
added 3 commits
Hi @felipec , Comments for TDMA are done! In the file analysis/uni/basic/tdma_wcrt_analysis.v, there is a list of basic and generic lemmas which will be used several times, so I now put them into two subsections and give some comments
Also, a single commit for organizing lemmas div/mod is done!
Could you take a look at them? and please tell me whether there are still any unclear places. I am glad to make our file more readable.
Thanks
