# Help with git fu
**URL:** https://community.openpbs.org/t/help-with-git-fu/2808
**Category:** Developers
**Created:** [September 29, 2021, 4:55am UTC](https://community.openpbs.org/t/help-with-git-fu/2808 "2021-09-29T04:55:51Z")
**Posts on this page:** 3
**Page:** 1
### Author:  [@dtalcott](https://community.openpbs.org/u/dtalcott)
#### Post date: [September 29, 2021, 4:55am UTC](https://community.openpbs.org/t/help-with-git-fu/2808/1 "2021-09-29T04:55:51Z")
I have a pending pull request that ran into conflicts because Bhroam snuck in some changes between the time I rebased this morning and the time my pull request was checked.
>
>
> The OpenPBS sources contain several local modifications for NAS (NASA Advanced S…upercomputing). The affected code is usually bracketed by #ifdef NAS / #endif lines. Over time, some of these modifications have become unused or unneeded. They can be removed to simplify the code and make maintenance easier.
>
> This PR removes the code associated with NAS localmods for:
>
> 004 Put qsub DBPRT output on stderr, rather than stdout.
>
> 019 Work around bug in bash by adding --login to command line.
>
> 043 Allow pbsfs to display all groups, even those with default usage.
>
> 054 Additional sanity checks in scheduler's create\_server\_arrays(). The checks have not tripped in recent memory.
>
> 063 Return early from eval\_selspec() if there are 0 chunks.
>
> 073 Add -v and -np options to mpiexec and allow supplying a custom sgiMPI.awk file.
>
> 074 Use 1 as the default for pbs\_mpirun's -np argument.
>
> 080 Modify sgigenvnodelist to use (more nearly) constant names for Altix nodes, rather than have the nodes renamed when one blade is removed/powered down.
>
> 086 In get\_server(), allow users to use hostname aliases for the server name portion of a job identifier.
>
> 090 Modify MoM to allow requesting the boot time and current clock for the MoM's host.
>
> 097 Modify check\_soft\_limits() to exit early if we know there are no soft limits set.
>
> 109 Extra debugging messages in server job dependency code.
>
> 113 Disable use of hwloc in the MoM.
>
> 122 If req\_confirmresv() is asked to confirm an already confirmed advance reservation, return without side effects.
>
> 133 Stray piece of "Watson" code.
>
> Also removes some of the code for localmod 005, which allowed code to build cleanly with Intel compiler.
>
> \#### Attach Test and Valgrind Logs/Output
> Code builds okay with same warning as without the mod:
>
> \`/bin/sh ../../libtool --tag=CC --mode=link gcc -g -O2 -all-static -o pbs\_sleep pbs\_sleep.o -ldl -lcrypt -lc -lc\`
> \`libtool: link: warning: complete static linking is impossible in this configuration\`
>
> pbs\_benchpress -t SmokeTest ran fine:
>
> \`2021-09-18 12:24:01,514 INFO ================================================================================\`
> \`run: 52, succeeded: 52, failed: 0, errors: 0, skipped: 0, timedout: 0\`
> \`Tests run in 0:22:39.864640\`
My git skills are not good enough to know what to do next. I have re-rebased my changes on this evening’s top-of-tree in my local copy of my fork, and fixed the conflicts:
```auto
On branch lessNAS
Your branch and 'drtoss/lessNAS' have diverged,
and have 2 and 1 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
> git log --oneline | head -4
f5e1bf97 Remove unneeded #ifdef NAS code
694b4372 Refactor reconfirming reservations and nspec** -> vector (#2484)
1123b654 Collating DIS routines, removing unused (#2477)
12962f69 PTL create_moms() method creates moms if pbsnodes list is empty (#2481
```
What is the correct way to get the fixed patch to the maintainers? Do I force push my local branch over my fork on github? How do I let the maintainers know there is a new version to pull?
Thanks for any advice.
---
### Author:  [@agrawalravi90](https://community.openpbs.org/u/agrawalravi90)
#### Post date: [September 29, 2021, 5:06am UTC](https://community.openpbs.org/t/help-with-git-fu/2808/2 "2021-09-29T05:06:01Z")
If you are sure that your local branch has the correct changes, then all that you should need to do now is a force push, i.e - `git push -f drtoss lessNAS`.
---
### Author:  [@dtalcott](https://community.openpbs.org/u/dtalcott)
#### Post date: [September 30, 2021, 1:04am UTC](https://community.openpbs.org/t/help-with-git-fu/2808/3 "2021-09-30T01:04:46Z")
That worked. Thanks.