> Here’s the results of "git log —graph” on the feature branch. Does that first
> part look right? I feel like I messed up something from the very start but
> I’m not sure what.
>
> Ryans-MacBook-Pro-2:fpc-git ryanjoseph$ git log --graph
> * commit c5a6c2c0822d6c869a788a98a144e739a97d517a (HEAD -> generic_constants,
> origin/generic_constants)
> | Author: Ryan Joseph <[email protected]>
> | Date: Sat Jul 20 09:40:58 2019 -0400
> |
> | fixed bugs with range checking and constants + added 2 tests
> |
> * commit 49de8113a1eb29b368d89d9e2fb7fa7c932d937e
> | Author: Ryan Joseph <[email protected]>
> | Date: Mon Mar 25 10:35:47 2019 -0400
> |
> | reverted back bad line endings in htypechk.pas
> |
> * commit 128d695bf83fb19de342d8e23101ec0223e08e1b
> | Author: Ryan Joseph <[email protected]>
> | Date: Fri Mar 22 13:10:12 2019 -0400
> |
> | added 2 more tests
> |
> * commit 4dcdd8932d5bc50b5d87bc8e1f1a7ea4e6d5b29f
> | Author: Ryan Joseph <[email protected]>
> | Date: Tue Mar 19 09:18:39 2019 -0400
> |
> | Fixed more operator bugs and added test
> |
> * commit f2039f13c74e74cb523076b27ff6559ae69ad7d1
> :
Have you renamed your branch?
Last time you mentioned it was "gen-const-new".
And you didn't include enough log to see origin/master (see in brackets like in
your first commit).
Again your commits should be at the top of origin/master if "git rebase" did
its job correctly without any conflicts.
If you have conflicts, you need to resolve them one by one and do "git rebase
--continue" each time.
-- Regards,
Denis Golovan
_______________________________________________
fpc-devel maillist - [email protected]
https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
