Updated credits and contributing #3413

Gitea implied I could rebase the branch on his fork, and I couldn't and after that fork information was broken and I couldn't even merge it. Finally got around to creating a separate branch and merging it in.

> I'm glad that you added @anarquimarco into the credits. (For the translation credits.) Gitea implied I could rebase the branch on his fork, and I couldn't and after that fork information was broken and I couldn't even merge it. Finally got around to creating a separate branch and merging it in.

❤️ 1

Michieal commented

2023-02-08 00:51:21 +01:00

The rebase command seems pretty hinky and quite prone to causing havoc.

The `rebase` command seems pretty hinky and quite prone to causing havoc.

Ghost commented

2023-02-08 01:28:05 +01:00

First-time contributor

Hinky? Its a bit hard to use, but its great once you learn how to use it. Its also required to fix merge issues so you can merge.

ancientmarinerdev commented

2023-02-08 01:31:55 +01:00

The rebase command seems pretty hinky and quite prone to causing havoc.

The rebase is fine. This isn't a git issue. It's a gitea issue. Gitea allows you to try and rebase when you don't have access and it gets into a weird state it shouldn't where the PR data gets messed up.

> The `rebase` command seems pretty hinky and quite prone to causing havoc. The rebase is fine. This isn't a git issue. It's a gitea issue. Gitea allows you to try and rebase when you don't have access and it gets into a weird state it shouldn't where the PR data gets messed up.

👍 1

Ghost commented

2023-02-08 02:48:10 +01:00

First-time contributor

One gitea issue I noticed is if you use the rebase button, it will say broken fork information. If you refresh it, it will start the merge issue checker.

👍 1

ancientmarinerdev commented

2023-02-08 03:22:16 +01:00

One gitea issue I noticed is if you use the rebase button, it will say broken fork information. If you refresh it, it will start the merge issue checker.

Yeah, most of the time that does the trick, but not always.

> One gitea issue I noticed is if you use the rebase button, it will say broken fork information. If you refresh it, it will start the merge issue checker. Yeah, most of the time that does the trick, but not always.

Michieal commented

2023-02-08 03:54:20 +01:00

nods hinky. Most of my experience with it, is through Gitea... and that's where I learned that if you really want to hose things and make the branch horribly broken... use rebase.

One gitea issue I noticed is if you use the rebase button, it will say broken fork information. If you refresh it, it will start the merge issue checker.

I've not had that be successful.
What has worked well, is doing rebase in something other than Gitea.

Yeah, most of the time that does the trick, but not always.

I've not been lucky enough to have this work, so my perception of it's viability could be skewed due to personal experience.

*nods* hinky. Most of my experience with it, is through Gitea... and that's where I learned that if you really want to hose things and make the branch horribly broken... use rebase. > One gitea issue I noticed is if you use the rebase button, it will say broken fork information. If you refresh it, it will start the merge issue checker. I've not had that be successful. What has worked well, is doing rebase in something *other than* Gitea. > Yeah, most of the time that does the trick, but not always. I've not been lucky enough to have this work, so my perception of it's viability could be skewed due to personal experience.

Ghost commented

2023-02-08 04:41:51 +01:00

First-time contributor

Also, I forgot to mention, but when you need to update the branch after you rebase from gitea, you need to delete the local branch and check it out again. I think this PR might end up being the knowledge of the works of rebasing discussion for future coders 😏.

❤️ 1 🎉 1 😆 1

Michieal commented

2023-02-08 04:52:01 +01:00

Also, I forgot to mention, but when you need to update the branch after you rebase from gitea, you need to delete the local branch and check it out again. I think this PR might end up being the knowledge of the works of rebasing discussion for future coders 😏.

That is indeed, very helpful knowledge.

> Also, I forgot to mention, but when you need to update the branch after you rebase from gitea, you need to delete the local branch and check it out again. I think this PR might end up being the knowledge of the works of rebasing discussion for future coders 😏. > That is indeed, very helpful knowledge.

Sign in to join this conversation.

No reviewers