Today was a bit frustrating because I was trying to merge a piece of code to the master, but while I was resolving the commit master code changed.
Then I resolved it again and meanwhile, the master code changed again.
Then in-between IntelliJ pushed some unrelated code with the merge. So my PR started to look big and had unrelated changes. Then I reset the commit to an earlier time and rebased fresh with the master.
This time it was rebased and not merge.
And then requested everyone to hold their merges until I merge this change to the master and that’s how I was able to take my code to the master.
While I was busy with resolving conflicts and merges, I forgot to cook anything for myself.
And today I was not feeling like cooking as well. So that is another reason why I didn’t cook anything.
Then in the evening, I went to play basketball.
After the game, I was hungry. But still, I was not feeling like cooking. So, I microwaved the pizza and had it for the dinner. That’s how I filled my stomach.
I’m telling you, a single’s life is not easy at all.
Leave a Reply