Linux

48074 readers

731 users here now

From Wikipedia, the free encyclopedia

Linux is a family of open source Unix-like operating systems based on the Linux kernel, an operating system kernel first released on September 17, 1991 by Linus Torvalds. Linux is typically packaged in a Linux distribution (or distro for short).

Distributions include the Linux kernel and supporting system software and libraries, many of which are provided by the GNU Project. Many Linux distributions use the word "Linux" in their name, but the Free Software Foundation uses the name GNU/Linux to emphasize the importance of GNU software, causing some controversy.

Rules

Posts must be relevant to operating systems running the Linux kernel. GNU/Linux or otherwise.
No misinformation
No NSFW content
No hate speech, bigotry, etc

Related Communities

Community icon by Alpár-Etele Méder, licensed under CC BY 3.0

founded 5 years ago

MODERATORS

[email protected]

I bit confused on github fork (feddit.it)

submitted 4 months ago by [email protected] to c/[email protected]

5 comments fedilink hide all child comments

So, this is my situation: I've forked this repository which contains dotfile and script for hyprland. I changed some files and now, if I want to sync all the commits made on the original repository to my repository github says "This branch has conflicts that must be resolved". My question is: can I merge only the commits that don't conflict with my files? What else can I do?

all 6 comments

sorted by: hot top controversial new old

[–] [email protected] 14 points 4 months ago* (last edited 4 months ago) (1 children)

You pull the origin to your fork and solve the conflicts one by one, that's usually how it goes.

If you want to keep your files how they are you can select "accept local changes" instead of "accept incoming changes". That's it.

Edit: If you need something more detailed let me know, I am assuming you are using an IDE like VSCode

[–] [email protected] 2 points 4 months ago (1 children)

Thanks, I was able to do exactly what I wanted.

[–] [email protected] 1 points 4 months ago

Just make sure things are working while doing this. Maybe accepting your changes and the incoming changes is the correct way, but you need to know what you are doing.

[–] [email protected] 4 points 4 months ago

You can still merge the whole upstream branch manually with a local clone, and git will stop on each conflict for you to resolve them. Then when it's done you can push the merged branch to your fork.