<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e2c069462193bc1a55bd098c9f8a810803ff6583">https://github.com/macports/macports-ports/commit/e2c069462193bc1a55bd098c9f8a810803ff6583</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new e2c06946219 git, git-devel: fix conflicts
</span>e2c06946219 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e2c069462193bc1a55bd098c9f8a810803ff6583
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Mon Mar 13 21:04:36 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    git, git-devel: fix conflicts
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - add note about devel version
</span>---
 devel/git/Portfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/Portfile b/devel/git/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7bf66d09640..18b90a9ce26 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,8 @@ legacysupport.newest_darwin_requires_legacy 10
</span> 
 # RELEASE VERSION
 name                git
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: Update the DEVEL version first before updating this RELEASE version,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#       to verify that the intended version builds on all platforms.
</span> version             2.39.2
 revision            0
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,8 +32,6 @@ subport ${name}-devel {
</span> 
     long_description \
         {*}${long_description} (Development Version)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts           git
</span> }
 
 maintainers         {ciserlohn @ci42} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +47,6 @@ installs_libs       no
</span> master_sites-append https://www.kernel.org/pub/software/scm/git/:git \
                     https://cdn.kernel.org/pub/software/scm/git/:git
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           ${name}-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${name} eq ${subport}} {
     # RELEASE VERSION
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,6 +68,7 @@ if {${name} eq ${subport}} {
</span>     extract.only    git-${version}${extract.suffix} \
                     git-manpages-${version}${extract.suffix}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts       git-devel
</span> } else {
     # DEVELOPMENT VERSION
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,6 +87,8 @@ if {${name} eq ${subport}} {
</span>         # https://trac.macports.org/ticket/67091
         patchfiles-append   patch-disable-enhanced-basic-regex.diff
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts       git
</span> }
 
 perl5.require_variant   false
</pre><pre style='margin:0'>

</pre>