I'm crap with Git, so please bear with me, but I have a question...

Say someone sends me a PR for one of my repositories, and since that PR was made, there have been other pushes to that repo.

So...

Day 1 --> PR added
Day 2 --> A new commit is made

If on Day 3 I decide to merge the PR, what happens to the changes that were made on Day 2?

Thanks!

Follow

Thanks everyone for jumping on - I love this community!

Sign in to participate in the conversation
Fosstodon

Fosstodon is an English speaking Mastodon instance that is open to anyone who is interested in technology; particularly free & open source software.